Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 8 Aug 2010 22:52:25 +0000 (22:52 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 8 Aug 2010 22:52:25 +0000 (22:52 +0000)
commitea6a4ab23da012d22e91c27c12b86c39531e8b8d
treeb4d2191daa6ee4c167fdc62bbb75978ad6115628
parent17e85aec856b360342b2b315b6f03ebd42b9c59a
parentaaf349f2e178ebcb5f9c2b0e72edb2d6ad1d4a8d
Merge from mainline.